Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 5 Feb 2011 23:34:04 +0000 (15:34 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 5 Feb 2011 23:34:04 +0000 (15:34 -0800)

Trivial merge